From d7042395c44e79c11c7fc275112216a7903a847d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 15 Feb 2004 21:06:53 +0000 Subject: [PATCH] Add deprecation notes pointing people to GtkComboBox. --- ChangeLog | 5 ++++ ChangeLog.pre-2-10 | 5 ++++ ChangeLog.pre-2-4 | 5 ++++ ChangeLog.pre-2-6 | 5 ++++ ChangeLog.pre-2-8 | 5 ++++ docs/reference/ChangeLog | 6 ++++ docs/reference/gtk/tmpl/gtkcombo.sgml | 34 ++++++++++------------ docs/reference/gtk/tmpl/gtkoptionmenu.sgml | 13 +++++++-- gtk/gtkoptionmenu.c | 1 + 9 files changed, 57 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed09d8a7f2..1d2d5491e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 15 22:08:53 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add + deprecation note pointing people to GtkComboBox. + Sun Feb 15 02:49:45 2004 Matthias Clasen * gtk/gtktreednd.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ed09d8a7f2..1d2d5491e0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Feb 15 22:08:53 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add + deprecation note pointing people to GtkComboBox. + Sun Feb 15 02:49:45 2004 Matthias Clasen * gtk/gtktreednd.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ed09d8a7f2..1d2d5491e0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Feb 15 22:08:53 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add + deprecation note pointing people to GtkComboBox. + Sun Feb 15 02:49:45 2004 Matthias Clasen * gtk/gtktreednd.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ed09d8a7f2..1d2d5491e0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Feb 15 22:08:53 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add + deprecation note pointing people to GtkComboBox. + Sun Feb 15 02:49:45 2004 Matthias Clasen * gtk/gtktreednd.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ed09d8a7f2..1d2d5491e0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Feb 15 22:08:53 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add + deprecation note pointing people to GtkComboBox. + Sun Feb 15 02:49:45 2004 Matthias Clasen * gtk/gtktreednd.c: diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 59113ab26b..d48b05e0a0 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,9 @@ +Sun Feb 15 22:09:53 2004 Matthias Clasen + + * gtk/tmpl/gtkcombo.sgml: + * gtk/tmpl/gtkoptionmenu.sgml: Add deprecation notes pointing + people to GtkComboBox. + Sun Feb 15 02:46:53 2004 Matthias Clasen * gtk/tmpl/gtktreednd.sgml: Add docs. diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml index 5263ac2d77..f5b13af453 100644 --- a/docs/reference/gtk/tmpl/gtkcombo.sgml +++ b/docs/reference/gtk/tmpl/gtkcombo.sgml @@ -23,6 +23,9 @@ By default, the user can step through the items in the list using the arrow (cursor) keys, though this behaviour can be turned off with gtk_combo_set_use_arrows(). + +As of GTK+ 2.4, #GtkCombo has been deprecated in favor of #GtkComboBox. + Creating a <structname>GtkCombo</structname> widget with simple text @@ -85,26 +88,10 @@ items. The #GtkFixedChild-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) - - - - - - -#GtkWidget *entry; -the text entry field. - - - -#GtkWidget *list; -the list shown in the drop-down window. - - - -@entry: -@list: +@entry: the text entry field. +@list: the list shown in the drop-down window. @@ -137,6 +124,7 @@ Creates a new #GtkCombo. @Returns: a new #GtkCombo. +@Deprecated: Use #GtkComboBox instead. @@ -147,6 +135,7 @@ Convenience function to set all of the items in the popup list. @combo: a #GtkCombo. @strings: a list of strings, or %NULL to clear the popup list +@Deprecated: Use #GtkComboBox instead. @@ -162,6 +151,7 @@ If an empty field is acceptable, the @ok_if_empty parameter should be %TRUE. @combo: a #GtkCombo. @val: %TRUE if the value entered must match one of the values in the list. @ok_if_empty: %TRUE if an empty value is considered valid. +@Deprecated: Use #GtkComboBox instead. @@ -171,7 +161,9 @@ the list. This is on by default. @combo: a #GtkCombo. -@val: %TRUE if the arrow keys can be used to step through the items in the list. +@val: %TRUE if the arrow keys can be used to step through the items in + the list. +@Deprecated: Use #GtkComboBox instead. @@ -181,6 +173,7 @@ Obsolete function, does nothing. @combo: a #GtkCombo. @val: unused +@Deprecated: Use #GtkComboBox instead. @@ -196,6 +189,7 @@ worried about differences in case. @combo: a #GtkCombo. @val: %TRUE if the text in the list items is case sensitive. +@Deprecated: Use #GtkComboBox instead. @@ -207,6 +201,7 @@ selected. This is needed if the list item is not a simple label. @combo: a #GtkCombo. @item: a #GtkItem. @item_value: the string to place in the #GtkEntry when @item is selected. +@Deprecated: Use #GtkComboBox instead. @@ -218,5 +213,6 @@ instead. @combo: a #GtkCombo. +@Deprecated: Use #GtkComboBox instead. diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index c2cf8f8528..f308907f0c 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -22,6 +22,10 @@ the option menu; in the "changed" signal, check the new selected menu item with gtk_option_menu_get_history(). + +As of GTK+ 2.4, #GtkOptionMenu has been deprecated in favor of #GtkComboBox. + + @@ -60,7 +64,7 @@ Creates a new #GtkOptionMenu. @Returns: a new #GtkOptionMenu. - +@Deprecated: Use #GtkComboBox instead. @@ -69,6 +73,7 @@ Returns the #GtkMenu associated with the #GtkOptionMenu. @option_menu: a #GtkOptionMenu. @Returns: the #GtkMenu associated with the #GtkOptionMenu. +@Deprecated: Use #GtkComboBox instead. @@ -80,6 +85,7 @@ use of tearoff menu items, submenus, and accelerators. @option_menu: a #GtkOptionMenu. @menu: the #GtkMenu to associate with the #GtkOptionMenu. +@Deprecated: Use #GtkComboBox instead. @@ -88,6 +94,7 @@ Removes the menu from the option menu. @option_menu: a #GtkOptionMenu. +@Deprecated: Use #GtkComboBox instead. @@ -97,8 +104,8 @@ selected value for the option menu. @option_menu: a #GtkOptionMenu. -@index_: the index of the menu item to select. Index values are from -0 to n-1. +@index_: the index of the menu item to select. Index values are from 0 to n-1. +@Deprecated: Use #GtkComboBox instead. diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 139f7ca84b..e45f474636 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -337,6 +337,7 @@ gtk_option_menu_set_history (GtkOptionMenu *option_menu, * items are numbered from top to bottom, starting with 0. * * Return value: index of the selected menu item, or -1 if there are no menu items + * Deprecated: Use #GtkComboBox instead. **/ gint gtk_option_menu_get_history (GtkOptionMenu *option_menu) -- 2.30.2